From f1f83c1da0e6b1944c8bbb5b3b6b71d183b71f69 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Fri, 4 Jul 2008 20:09:57 +0000
Subject: [PATCH] More debork

svn path=/trunk/; revision=20766
---
 gtk/gtkmenu.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 9687c3ab13..4d21d4a8b7 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -794,7 +794,17 @@ gtk_menu_set_property (GObject      *object,
       gtk_menu_set_accel_path (menu, g_value_get_string (value));
       break;
     case PROP_ATTACH_WIDGET:
-      gtk_menu_attach_to_widget (menu, g_value_get_object (value), NULL);
+      {
+        GtkWidget *widget;
+
+        widget = gtk_menu_get_attach_widget (menu);
+        if (widget)
+          gtk_menu_detach (menu);
+
+        widget = (GtkWidget*) g_value_get_object (value); 
+        if (widget)
+          gtk_menu_attach_to_widget (menu, widget, NULL);
+      }
       break;
     case PROP_TEAROFF_STATE:
       gtk_menu_set_tearoff_state (menu, g_value_get_boolean (value));
-- 
2.30.2